bitkeeper revision 1.1159.1.334 (4187adc0n-3Z_SsPLaSxR1xWmI18lA)

The header file has been moved.

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 376cc2293fb7a9ab6261f92dc8f5aff8e476f9c5..9c08485b369b92607a44a80d24eefe693fd2e8cb 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -9,6 +9,7 @@ bd240@labyrinth.cl.cam.ac.uk
 br260@br260.wolfson.cam.ac.uk
 br260@labyrinth.cl.cam.ac.uk
 br260@laudney.cl.cam.ac.uk
+bren@anvil.research
 cl349@freefall.cl.cam.ac.uk
 cl349@labyrinth.cl.cam.ac.uk
 cwc22@centipede.cl.cam.ac.uk

diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c
index bf6e00bd313fbb76c32767e00c91640c58bfef28..1f7303efd2f4cf5f09db459c3fa08d6f684cb3b8 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c
@@ -49,7 +49,7 @@ EXPORT_SYMBOL(machine_power_off);
  * Stop/pickle callback handling.
  */
 
-#include <asm/suspend.h>
+//#include <asm/suspend.h>
 
 /* Ignore multiple shutdown requests. */
 static int shutting_down = -1;